Made it compile and work on Qt4.8, bar some tests.#7
Open
falemagn wants to merge 8 commits intonitroshare:masterfrom
Open
Made it compile and work on Qt4.8, bar some tests.#7falemagn wants to merge 8 commits intonitroshare:masterfrom
falemagn wants to merge 8 commits intonitroshare:masterfrom
Conversation
…h Qt4.8. Else, fail. Tests don't compile yet, examples do.
…ctionalities in library.
Member
|
Awesome! I'll take a look when I get home this evening. |
Member
|
Thank-you so much for contributing some code. I would love to add support for Qt 4.x but there are a couple of issues with the pull request that would need to be addressed in some way before I could merge it:
My suggestion for avoiding both of these problems is to simply copy the code from those two repositories into the source tree. They are both licensed under the LGPL. Neither has been updated in the last 2-3 years so there isn't a lot of benefit in linking upstream anyway. As far as Launchpad goes, I think you can work around the problem by removing the submodules and squashing your commits (using Thanks again! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The proposed changes make the library compile and work also on Qt4.8, except for some of the tests, for I didn't put much effort into understanding how to backport them. The missing tests are:
I had to fix the class QIByteArray because of the change in constructor semantics between Qt 4.8 and 5.1.
The other three tests thus compile and pass.
The examples work too, as far as I could see.
I did my best to reduce the changes at a minimum, but it's the first time I work with CMake so the odds I might have done something not quite smart are not quite low.
The backport relies on two external projects which are included in the repository as submodules and automatically updated when CMake is run. These projects are: